Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 23:52:31 +0000 (16:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 23:52:31 +0000 (16:52 -0700)
commitc468ce660cd97ea27b726c18f40983946b942d09
treea663076e86e47256068e0be3c649cdbb77236e20
parenteab8bdcb22c95d224cce23ce8fcee349ce803edd
parent6bda996fea814b9a6299029e5ce6c227a3c4ec3b
Merge from trunk.